More kernel changes, pt 2