Adjustements and fixes