Added a few linker fixes.