Fix errors after testing

- Map pins correctly
- Stop recursing self