A bunch of misc changes