Add Giorgio's issues