Fix poll, add compatibility with batarang