Some cfg edits