Some configuration fixes.