Weather and misc fixes