Invoice payment and acceptance fixes