More small improvements.