Shotmap integration bugfixes

These suggested revisions were brought about during my attempt to integrate metatrans with shotmap. Please let me know if you have any questions.