Refers #172 -- Minor fixes