Fix: clang11 build warnings
This should fix the clang11 build warnings we see in the nightlies.
@cvazquez I've left the "Fixed Formatting" commit as an extra commit, as that one changes a lot and makes spotting the few changes I made more difficult.
We can then squash the commits once this is merged