More linkage fixes...