Small fixes from #352
5 files changed