Fix fetch and bugfixes