More fixes for EML streams