client - small fixes