Modified failed patches to work with 4.3.1