Make fixes according to @tadatuta notations for this pr.