Kernel fixes
Kernel and more path fixes