Bugfix

- Fixes #1425
- Fixes #1426 
- Fixes #1472