Fix linkage warnings