fetch code fixes