fix some issures