Trying another fix for web-server errors; #492, #480, #411.