more WFS fixes