Makefile changes for Windows build
Makefile fixes