[Client] Major fixes