Fix bugs

Now starting from a non arena scene does not cause issues.