fixes from expo errors
Merge branch 'staging'