Minor Toxins change fixes