more win makefile fixes