Update some fiddley bits.