Few fixes !