[Core] Fixed compilation issues for tools;