yotam: Minor fix-ups for deployment 2