Fixing header stuff