Fixes for admin