Some quick minor fixes.

I'll be getting to the bigger stuff soon, but wanted to get these out now since they were simple.