Misc minor fixes

Some stuff I had stashed away