Sanitation fixes