various fixes in kern data code