Fix v2 routes