[#3236] minor tweaks