Updates to ui5 compatibility