A few small improvements.