Fixes

Merged Michal Čížek requested to merge fixes into main

Merge request reports