Misc minor kernel-related changes.