Update for new kernel