added fixes for old WinXP