Modernizer tweaks