Sample App - Payment fixes