I think this fixes the linker bugs.