initial v2 compatibility fixes