Fixed header comments