Update Xbox target names plus fix savestates