Correct linker errors and one typo