Minor fixes

Fixes gh-1306