Scripts/EoE: Some important fixes