Minor bug fixes

Fixes minor bugs introduced in v0.1.2