Fix XP issues