Minor fixes !