More ckernel changes