Fixed some linkage problems that I didn't know I had