Bug fixes, Changes to sanitation module