Minor updates
Merge branch 'Pau'