A few more improvements.