Small fixes following reviewers remarks. More to come.