Fixing TerminationDirective return types