Minor adjustments to config