fix a lot of warnings caused by !171

There were a number of warnings introduced by !171 (merged) (that should have been caught by CI...) like unused variables and variable shadows.