Fixes to a few bugs discovered in testing