Minor improvements to configs