Merge "Little fix for headers comparison tool"