Applied compat and performance fixes to win7/win8 boxes