v2 Prototype issues and fixes