fixes in wt