More fixes to the EC gateway