Little improvments