Fixed administration bugs