Small enhancements for v3 support