Fix more linking issues.