Fixup: Second round of reviews