Weather bugfixes