More fixes, trying to patch fetchData