Minor fixes

Just a handful of minor fixes.