Lightweight improvements on UI and error messages.