More changes to reduce complaints from CppCheck. Some latent bugs fixes, but probably some new typos introduced
