Bug fixes for WFS Factory.