Feature/v2 bugfixes