Final hacks to make it work if one pusher isn't around