A bunch of other modifications