[fixup] Address review