Fixed some things with fetch