Fix linker errors