Some (hopefully) last changes according to linux testing