Improve compatibility with very modular kernels