Add more kernels tweaks