A few linker improvements