Fix links to util-*