Many fixes for v1