Fix fetch and edit friends