Is trying to fix client. I have not compiled, but I am not sure if it works before keystores