WFS fixes.