Some configuration improvements.