Make a few minor improvements.