fixed some MSVC compiler linkage issues :S