Switch to are own kernel with fixes