two small fixes for client