Updates from changes in Web_UI library