Smaller changes [noci]