More kernel related updates