Some minor configuration changes