Fix order of kernel list
Minor changes