Fixing WS deployment problems