[#72] Minor changes