Windows platform fixes