fixes for 3.8