A couple of fixes for issues with the webadmin