Preliminary web-related changes