Minor reordering in the kernel