Fixed admin and a few helper methods.