[Pepper] Bug fixes

Summary: Bug fixes

Test Plan: Use app

Reviewers: ccc, alexrestrepo, alexkarpenko

Reviewed by: ccc

CC:

Task ID: