Minore improvements.