Additional fix-ups.