VOYEUR: Fix some more CppCheck warnings