Put dirty patch into the attic. I hope Marc will apply selected fixes.