[#397] Minor tweaks