Revert "Revert "Minor changes to config""

This reverts commit 7355eb59ea0dbf1ff13563ac4801cb6be42aef94.