Fixes for spectator switch issue