A bunch of cfg changes