more kernel fixes