[3.9] Some fixes