Fixing some headers