fix some issuses