Windows Hotfixes

Small fixes to get all nosetests passing under Windows.