Fix problems with Windows

See #49