Implement minor adjustments to enable Windows compilation