Some final last changes