Fixes for Elie's comments
Merge branch 'unstable'