more fixes for 3.16.x