more friendly fixes in admin