Update for kernel changes