Minor fixes

close #19