fixes for client