Fix to prevent empty strings from being emitted as []. Fix missing type on envelope.