[#510] Minor fixes