Minor changes on configuration generation for kernel