Changes to helpers and vendor