[#3154] few minor fixes