few more tweaks for #134