[fixup] Address more review