Minor changes linker-wise