Some last changes
