Minor changes to client behavior