Fix some problems from issue #23 #32

Merged
ztimms73 merged 1 commits from devel into devel 2021-05-19 03:51:49 +00:00