Fix a few more linker issues