WT fixes based on Jerome's feedback