Fixed everything in the XS port