Tweak to new kernel stuffs.