Some tweaks !