Minor changes to a bunch of things