Fix segment and leftover user.-calls.