Adding windows-platform fixes