Fix Forecast failures