Few last changes