Fix comment management