minor fixes for #230