Bugfix

- Fixes #1460
- Fixes #1464 
- Fixes #1439