Some client modifications