Fix for GCC 12.2

Fix for GCC 12.2 and code cleanup

Merge request reports

Loading