Minor cleanups in WebFactory