Fix linkage errors
Undo commit
fixed vs linkage errors