Small changes to configuration