Restart instability improvement: less adherence to UI from CCWBuilder