Scripts/EoE: Small changes