Weather header fixes