Fixes

Here's a handful of minor fixes.