Neaten up the apache links