more fixes for 1.87