Fixups after Ilya's review