more minor fixes for #185