Fixup from paper review