incorporate JPR fixes to attempt windows build