Scripts/EoE: Some fucked-up logic fixes