fixes for 2.3.9