Fix existing issues for In-App - Batch 1

These commits belong to this card: https://trello.com/c/2sJdtTuX/179-fix-existing-release-issues-for-in-app-batch-1

@tejohnso please review