Fixing some conflicts with HTML pack