Fixed minor issues with payment