Update for kernel changes
Updates for kernel changes