Address the issues rekkanoryo found

2020-01-13, Gary Kramlich