prepare for admin tools migration, fixes