X code support and fixes
X code support and fixes