Update win-extras paths, and fix Makefile bug