misc. fixes after uikit update