More fixes. WDGT-18