fix few error