fixes #1931
fixes #1939
Merge pull request #1949 from digi604/fixes

Some blocker Fixes