Core/Weather: Misc change