Fixes after Functionnal review