Updates to cantina 4.1.x.