Commerce updates

Fixed a few bugs to help make our commerce system work better with the latest Ergo.