Fixed some linker problems.