Bugfixes:
- Fixed crashes