Made some fixes based on HeartlandPaymentServices