Minor changes to cfg-www