Intox adjustments

Please review changes from upstream.