More linkfixes