WS action fixes