Shotmap integration bugfixes