Other minor improvements.