Dependencies sanitization
Minor changes