Tried to correct Linker errors