Optimize kernel harder
Fix build
Fix build