More work on build for Windows