Fixed some issues.

Signed-off-by: Licht Takeuchi <b116240@hiroshima-u.ac.jp>