Etienne misc fixes

Fixes: 

- https://app.asana.com/0/11724913287040/17933536447544
- https://app.asana.com/0/11724913287040/19940508170813
- https://app.asana.com/0/11724913287040/19134892876284
- https://app.asana.com/0/11724913287040/21641345921435

@alexcjohnson @theengineear @chriddyp