More fixes for pusher