Make fixes according to @tadatuta notations for this pull request