[3.8.6] minor issues