minor fixes for #1869