Changes to support Sultan kernel.