Added some XP fixes