Fixed admin bugs