Minor fixes

A couple of other minor fixes from #549