Small fixes

Patches up some little things that I imagine were just oversights.