Make some small improvements.