Small bug fixes in config generation