Small rain-snow fixes