Emi - Fix payment mode default

Others fixes