Fixed more linking