Fixing several transforms which would drop the collector attribute