Rebased all patches to apply cleanly