Fix the sentry issues listed in this doc -https://docs.google.com/spreadsheets/d/1CSr3aBUUSMnv-IsrMDZ7PTDN6TBnKIkYQvZ0NuyRAVo/edit?usp=sharing