external-tools output fixes