fixes for UICustomizeKit changes