tweaks for admin and api compatibility