Finish tweaking the Archive and Auth components