Various fix for comment doubling