[3.8] Some improvements