Makefile changes for Windows