Fixing misc v2