FIX: Misc fixes

@drammock ready for review.

Closes #152.