Configuration improvements.