More madness trying to follow kernel changes