Kernel back to original. Fixed build problems.