More fixes from shallow fetch