PFC-2439 #comment fixes