Fix several broken in 1.1.0.x patches.