More web page generation fixes