Hopefully fix the linker errors