Cleanups

These are just some minor issues I noticed while working on the other stuff.