And a couple more fixes #136