Fix a couple of bugs caused by typos.

Fixes Issue #18 and Issue #19