Properly deal with client when not in sync; leaner plots