More fixes for v1