Fix WS CLI Agent calls