Fixing some incoherences

Code does not compile yet.