minor fixes for #375