[3.8.6] Some improvements