Adjust for xwt api breakage