Windows fixes

This passes tests!