Fixes for the new kernel