- Fix bug on startup on web
- Fix crash on Android