Fix more linking errors