Fixed data class issue.
Fixed problem with canceling paypal payments.