Changes tidying up user/group/principal