Razor speed fixes