OSPL-3315 Windows compilation fixes.