Fix more issues on /E and esil ret values