EBS Payment Bug Fixes