Fix for #1903
Fix for #1902
Merge pull request #1904 from basilfx/bugfixes8

Fixes for issues