Further archive style tweaks