fix some linkage issues