more fetch fixes