[3.8] Some fixes