Adding Windows Bug fixes that apply to linux