Fix webserver issues