Fixed linkage issues