Minor improvements to both.