So here is the new version of the first patch.  The second still applies
onto it.
-- 
Manuel Giraud