first round of fixes for uikit