Fixes for 5.3 and adjustments to the ui_bench yaml.