Add some missing config variables, fix network config variables placement