Fixups after hasty emergency commit