Some adjustements