Fixups for prev commit