Fix a few problems

I was unable to build the client without those modification.