Fixes #64 and #67

Sounds good.