Fix minor issues w payment