[3.8] Latest fixes