Fix more linker errors