Prep work for new kernel