Further minor improvements.