Fix linker issues for good