[#497] Minor fixes