Small adjustements