Fixes for #607