Make fixes according to @tadatuta comments for this pr