Attempt to fix some XP issues.