Some configuration fixes