Use six in a few more places