PFS-981 #comment fixes