Various fixes #234

Merged
icex2 merged 4 commits from various-fixes into master 2023-03-06 02:08:07 +03:00