Refresh some patches after bug 1000879 and 1001169.