Some headers fixed