Fixup after first round of reviews