Add some last changes