[#50] Minor fixes