[3.8] Minor fixes