Fixing modernizer clashes