Small improvements
More small improvements.