some tweaks for #3190