Fixed some issues with EML processing