Various pre-3.0 improvements.