Fixes for spectators