(chore) Update code to work with new kernel