Minor fixes for #430