Quick small fixes

Starting over on fork, mostly a test PR to get back into the swing of things.
Let me know if anything doesn't go right.