Some fixed after Aldo comments