Weather header - More fixes