a few fix