Other fixes. Manual merge from dk-dev-warps.

    Fix wrong const in kernel.