[code] Added xrt and other fixes.