Fixed linker errors

Fixed linker errors