Fixed some DUI bugs