Fixed linker errors