Wait longer for reboot on Windows
Fix Makefile for Windows command-line tools