Weather - stability and bug fixes

Missed this