v2 commit
Fix some issues