Add patches from Thierry for builder.pl