Minor changes
Convert old kernels to new interface