Fixed admin related changes