Fix some silly mistakes the tests didn't catch
Merge pull request #2 from leemachin/bugfix

Fix some silly mistakes the tests didn't catch