Fixed admin operations bugs