Fixing XP issues