More kernel changes, pt3