Some minor adjustements