Minor adjustements