Fixup after Simon's review