Various minor improvements.