More fixes after the split kernel apocalypse