Some small improvements.