fix some error
fix some error and warning