More kernel changes, pt x