Fix all the failures on SUMO stage

These commits address all the current failures, and this branch will also work on prod, so, once merged, we can update the prod jobs and remove the prod branch.