Minor updates in kernel. Cleaning kernel.