WS fixes