Final fixes for core.admin