Work again without CompilerManager
Fix comment.