Reorder self-update opts and correct requirements