minor fixes
Merge branch 'Giuliano'