Removed linkage errors