Some last changes.