various fixes for poison plugins