Create xt directory and small fixes