[#3330] Minor fixes