Export cancellable - minor changes