Flavio's corrections