Fixing more errors v2