Tweaks for kernel