Kernel finding tweaks etc