More configuration fixes.