Some configuration changes