More fixes for e-comm demo