[CorDebug] Fix build and fix issue with wrong output tracking.