Fixing 2 to 3 issues