Fixed some linker errors