Updates for compatibility with new umweb