Small tweaks on v2 project