v2 changes and fixes