Ensure source information is properly added to feeder messages.