some more fixes in Windows makefiles