Improvements to key controls.