Misc minor improvements.