Removed windows fixes