Some more porting to 2.9.2