Fix links per Eric's suggestions