More configuration fixes