Fixes for admin/setting mode