tweaks back ported from webserver

we made some changes on the web server right before the presentation
which were not captured here.