Fixed some classes and methods

Filip Kačenga requested to merge master into main

Merge request reports