Attempting to fix linker errors