A few fix