Correct linker errors