Fix possible crashes on call cleanup