[#204] Minor fixes