Add fixes from Takayuki Sasaki <sasaki@bsd.tnes.nec.co.jp>