experimental fixes for windows 7