#FEC-1032 #comment minor fixes