Admin App Fixes