Make some smaller changes