Minor changes to client