Misc config adjustments