Minor last changes