WS Fixes