Fixed a few error