fix a number of kernel references