HHH-9469 Windows platform build fixes