Smaller changes all around