Changes to fix Modernizer