some administration fixes