Changes for more recent kernels