FIX: Misc fixes
Merge pull request #153 from Eric89GXL/misc-fix

Looks good, tests pass, merging.