[Xwt] Fix last commit broken bits