Fixups for b4b3ea73d