Fixes and admin customizations