Fixes to work with web server.