Some minor changes to configuration