Small fixes mainly for UI.