Bug fixes after first data (A. Mastroserio)

No match.