Cleanup build and fix X.A.iOS ref