Windows Java build fixes;