Minor fixes

Fixes gh-1353 in particular.