small WS fixes