FIX: Minor fixes

New setup on a Windows computer Python 3.4, this makes tests pass (hooray!).

Ready for review/merge.