Various small patches for the web construction