Fix 6/21
Fix 7/21

Note that the tests must be changed too.
Fix 8/21
Fix 9/21
Fix 10/21
Partial fix 12/21

This does not solve the question of Aaron about RConfD
Fix 12/21 more
Fix 13/21