Further changes to work on Windows