Small Bug Fixes

Fixes #4