Olives: Update Olives and Emily to latest 1.x versions