fix: Misc fixups

Juraj Fiala requested to merge fix/misc into main

Merge request reports