Some client changes