Fix not-so-small errors (#7)