Client: Some fixes connected with move semantic