Minor fixes

Ready for review / merge @rkmaddox.