fix some issus