Made more linking changes