fixes for 3.17