Fix some kernels