Some fixes while testing the web+server integration.