Fixes to the spectator.