More fixes for broken admin area