Make smart-proxy scenarios more consistent with the descriptions