Fixes for version2