Fixup after Ryan's review