Try to fix Windows compilation problems

Make sure this works first.