Couple of changes for config