[#102] Minor tweaks