WFS fixes