Fixes to be more compatable with enex file specification