Fixing clipping issues and team ids