A couple of improvements.