[#344] Some more tweaks