Attempt to fix some bugs with spectating