Adding silly windows fixes for now :/