Intox adjustments

Please review changes from upstream.
We should remove this line