spiv: A few fixes for spiv.