A bunch of other changes