some fixes for admin
some fixes for admin