v2: Fix small issues