Some minor configuration fixes