Fixing more linker errors