Fixing Header issues