A bunch more linking fixes