Some tiny changes
Merge branch 'Nadine6.5'