Fixups for the previous commit