small client changes