Spectator fixes

Fixes #3340 and #3501.