[Toolkit] Fixed compilation error
[General] Fix comments