Fixup after spinscale's review