Fixed build
client improved