Misc : A few fix