[#235] tweaks