UADE bugfixes