#61: Fixed a few error.