Fix problems with Web version.