Fix other_button_titles and on_system_cancel