Bug fixes for XP deployment