Incorporate some patches.