Make Pusher stuff work better