some fixes in client_base & server