DUEA fixes