Minor changes to config generation