Kernel fixups