Scripts/EoE: Some fixes...

* too tired to describe