Fixes to ADD_JARS on Windows