Client fix-ups.