fix rebase problems and admin factory typo