Small changes related to 5.1 UI.