Even more minor changes to client behavior