misc changes
Merge branch 'fxdupont-misc'