fixed type issues
Merge branch 'payment'