[#6] Small fixes