Scripts/EoE: Some minnor changes