cgpt and vbutil_kernel fixes.