Add archive quote fixes