Few more changes in Kernel code