Minor changes before UI.