Fixes to make controls more closely match the built-in experience.