Fixed errors reported by Watabe-san