Several format fixes that were failing CI

Fixes several needles that were failing CI format check

Merge request reports

Loading