Completer termination fixes