Windows build changes. To be cleaned up later