Linker fixes