Some setup adjustements