Bug fixes to DUI