trivial fixes based on reveiw comment of v7 patch.