Some fixes for rare kernels