Av fix issues receipt

PT: https://www.pivotaltracker.com/s/projects/910044/stories/62177576 and
https://www.pivotaltracker.com/s/projects/910044/stories/63021482