Misc patches

These are a few small comments and issues I ran into while working on other things.