Fixes for the web interface