Minor improvements to