Fixup some review issues