A few fixes for the call to the linker