More fixes for admin dashboard