Fixes to UI bundles