More kernel fixes