Fix #1441 warnings

[acicovic]

Is your feature request related to a problem?

#1441 is showing some warnings, and we would like to fix them.

Describe the solution you'd like

Fix the warnings and merge #1441. This can also be done in the inverse order if needed.

Describe alternatives you've considered

Just ignoring the warnings, but they introduce noise (so this is not an optimal solution).